Release 3.5 - v3.5.30-dd.1#29
Merged
badouralix merged 6 commits intorelease-3.5-dd-v3.5.30-ddfrom May 7, 2026
Merged
Conversation
Cherry-pick etcd-io#13445 manually because the remote repository has been deleted, and add support for multiple values for allowed client and peer URIs Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
All tests were removed in etcd-io#20099, etcd-io#20236 and etcd-io#20315 as part of the upstream migration to prow kubernetes/test-infra#32754. Since we maintain a fork without tests running in prow, we want to maintain the tests in github actions. Hence this commit reverts the three pull requests mentioned above with the exception of release.yaml since we do not use the docker images built in this repository and govuln.yaml since govulncheck fails due to https://go.dev/cl/736180. Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
mvisonneau
approved these changes
May 6, 2026
nyodas
approved these changes
May 6, 2026
HadrienPatte
approved these changes
May 6, 2026
badouralix
force-pushed
the
badouralix/release-3.5-dd-v3.5.30-dd.1
branch
2 times, most recently
from
64485b3 to
678fbd0
Compare
The linux-386-e2e and linux-amd64-e2e tests have been failing even on the upstream v3.5.30 when run on github actions runners. See example run https://github.com/DataDog/etcd/actions/runs/25470722713. Even though this might highlight an actual issue worth investigating at some point, for now increasing the max watch delay is enough to compensate for the runners slowness. Running the tests locally show this is a runner-specific issue. cd tests/ && go test ./e2e/ -run TestWatchDelay -v -count=1 Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
badouralix
force-pushed
the
badouralix/release-3.5-dd-v3.5.30-dd.1
branch
from
678fbd0 to
83a5d95
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Picked up the same commits as in #14
Note that govuln.yaml was removed because it failed on
./tools/mod/due to https://go.dev/cl/736180See details in https://github.com/DataDog/etcd/actions/runs/25411392502/job/74533954485
Since we rely on upstream for dependency upgrades, we do not need to run our own vulnerability check
Note that consistently at least one of
TestWatchDelay*is failing, fixed similarly to etcd-io#15636No bump of the go version since
go1.25.9is already the latest 1.25 https://go.dev/doc/devel/release#go1.25.0Bumped the etcd version by running a huge sed command to replace all occurrences of
3.5.30by3.5.30-dd.1